Huis Verkennen Help
Registreer Inloggen
avalanche
/
avalanche2
Volgen 2
Ster 0
Vork 0

Bladeren bron
New start page and tests suite fix

jamesperet 10 jaren geleden
bovenliggende
6f19f6dee0
commit
6d824d5e47
11 gewijzigde bestanden met toevoegingen van 421 en 108 verwijderingen
Toon Diff Stats
  1. 8 1
      app/controllers/start_controller.rb
  2. 4 57
      app/views/start/index.html.erb
  3. 349 0
      app/views/start/landing_page.html.erb
  4. 13 5
      app/views/uploads/edit.html.erb
  5. 13 5
      app/views/uploads/new.html.erb
  6. 30 20
      app/views/uploads/show.html.erb
  7. 1 0
      config/routes.rb
  8. 0 4
      db/schema.rb
  9. 1 11
      features/admin_panel.feature
  10. 1 5
      features/email_subscription.feature
  11. 1 0
      features/step_definitions/login_steps.rb

+ 8 - 1
app/controllers/start_controller.rb
Bestand weergeven 

@@ -1,11 +1,18 @@
1 1 
 class StartController < ApplicationController
2 2
3 
-  layout 'landing_page'
3 
+  layout 'application'
4 4
5 5 
   def index
6 6 
     @blog_posts = BlogPost.order('created_at DESC').take(4)
7 7 
     @subscription = Subscription.new
8 8 
     @analytics.track('Home page view')
9 9 
   end
10 
+
11 
+  def landing_page
12 
+    @blog_posts = BlogPost.order('created_at DESC').take(4)
13 
+    @subscription = Subscription.new
14 
+    @analytics.track('Home page view')
15 
+    render layout: "landing_page"
16 
+  end
10 17
11 18 
 end

+ 4 - 57
app/views/start/index.html.erb
Bestand weergeven 

@@ -45,7 +45,7 @@
45 45
46 46 
 <div id="about" class="container" style="margin-top: 30px;">
47 47 
 	<div class="row">
48 
-
48 
+		<%= bootstrap_flash %>
49 49 
 		<div class="span6">
50 50 
 			<h2 class="landing_page hidden-phone"><%= (t "landing_page.about_title").html_safe %></h2>
51 51 
 			<%= (t "landing_page.about_text").html_safe %>
 
@@ -286,64 +286,11 @@
286 286 
     <%= bootstrap_form_for(@subscription, remote: true) do |f| %>
287 287 
       <%= f.alert_message "Please fix the errors below."%>
288 288 
       <%= f.form_group :email, style: 'margin-top: -35px;' do %>
289 
-        	<%= f.text_field :email, hide_label: true, placeholder: 'Email', class: 'span4', required: true, style: 'height: 50px; font-size: 24px; padding-top: 5px;' %>
289 
+        	<%= f.text_field :email, hide_label: true, placeholder: 'Email', id: 'subscription_email_mobile', class: 'span4', required: true, style: 'height: 50px; font-size: 24px; padding-top: 5px;' %>
290 290 
       <% end %>
291 
-      <%= f.submit (t 'subscription.submit'), class: 'btn btn-large', id: 'submit_subscription' %>
291 
+      <%= f.submit (t 'subscription.submit'), class: 'btn btn-large', id: 'submit_subscription_mobile' %>
292 292 
     <% end %>
293 293 
 </div>
294 294
295 
-<footer class="footer-white">
296 
-	<div class="container">
297 
-		<div class="row">
298 
-			<div class="column first">
299 
-				<div class="column-inner first centered">
300 
-			    	     <ul class="nav btn">
301 
-			    	          <li class="dropdown">
302 
-			    	            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
303 
-			    	              <%= t('landing_page.lang') %>
304 
-			    	              <span class="caret"></span>
305 
-			    	            </a>
306 
-			    	            <ul class="dropdown-menu dropdown-menu-right" role="menu">
307 
-			    	              <li>
308 
-			    	                <%= link_to t('landing_page.en'), change_locale_path(:en) %>
309 
-			    	              </li>
310 
-			    	              <li>
311 
-			    	                <%= link_to t('landing_page.pt-BR'), change_locale_path(:"pt-BR") %>
312 
-			    	              </li>
313 
-			    	            </ul>
314 
-			    	          </li>
315 
-			    	      </ul>
316 
-				 </div>
317 
-			 </div>
318 
-			 <div class="column">
319 
-				 <div class="column-inner">
320 
-  		 		    <a class="btn-about" href="#about"><%= (t "landing_page.about").html_safe %></a><br>
321 
-  		 		    <a class="btn-features" href="#features"><%= (t "landing_page.features").html_safe %></a><br>
322 
-  		 		    <a class="btn-subscribe" href="#subscribe"><%= (t "landing_page.subscribe").html_safe %></a><br>
323 
-  		 		    <%= link_to (t "registration.sign_in"), new_user_session_path, class: "btn-login" %><br>
324 
-			    </div>
325 
-			 </div>
326 
-			 <div class="column">
327 
-				 <div class="column-inner">
328 
-				 	<p><%= t 'contact.contact'%><br><a href="mailto:<%= t 'contact.email_contact'%>@avalanche.network"><%= t 'contact.email_contact'%>@avalanche.network</a><br><%= t 'contact.current_location'%></p>
329 
-				 </div>
330 
-			 </div>
331 
-			 <div class="column">
332 
-				 <div class="column-inner centered">
333 
-					 <a href="https://www.facebook.com/pages/Avalanche-Network/932907863393529"><i class="fa fa-facebook-square fa-4x"></i></a>
334 
-				 	 <a href="https://twitter.com/avalanche_net"><i class="fa fa-twitter fa-4x"></i></a>
335 
-				</div>
336 
-			 </div>
337 
-			 <div class="column">
338 
-				 <div class="column-inner last centered">
339 
-				  	<a href="https://mixpanel.com/f/partner"><img src="//cdn.mxpnl.com/site_media/images/partner/badge_light.png" alt="Mobile Analytics" /></a>
340 
-				</div>
341 
-			 </div>
342 
-		</div>
343 
-		<div class="row">
344 
-			<hr style="margin-top: 20px; border-top: 1px solid #000000;">
345 
-			<p class="copyright" style="text-align: center;">&copy; Avalanche Network <%= Time.now.year %></p>
346 
-		</div>
347 
-	</div>
348 
-</footer>
295 
+
349 296

+ 349 - 0
app/views/start/landing_page.html.erb
Bestand weergeven 

@@ -0,0 +1,349 @@
1 
+<% title @config.website_name %>
2 
+
3 
+<!-- Carousel
4 
+================================================== -->
5 
+<div id="myCarousel" class="hidden-phone carousel slide" data-ride="carousel" style="height: 400px">
6 
+	 <div class="carousel-inner" role="listbox">
7 
+	   <div class="item active">
8 
+		<div id="obscure_header" class="obscure" style="height: 960px;"></div>
9 
+	     <%= image_tag "photo_mission_control.jpg", id: 'photo_header', style: 'width: 100%;' %>
10 
+	     <div class="container" >
11 
+		  <div class="row">
12 
+			  <div class="span12" style="height: 20px;">
13 
+			       <div id="tagline_header" class="" style="background-color: transparent; position: relative; top: -700px;">
14 
+			         <h1 class="header"><%= (t "landing_page.tagline").html_safe %></h1>
15 
+			         <p class="lead header"><%= (t "landing_page.tagline_subtext").html_safe %></p>
16 
+			    	  </div>
17 
+		    	  </div>
18 
+	       </div>
19 
+          </div>
20 
+	  </div>
21 
+  </div>
22 
+</div><!-- /.carousel -->
23 
+
24 
+<!-- Carousel Mobile
25 
+================================================== -->
26 
+<div id="myCarousel2" class="visible-phone carousel slide" data-ride="carousel" style="height: 400px; margin-left: -20px; margin-right: -20px;">
27 
+	 <div class="carousel-inner" role="listbox">
28 
+	   <div class="item active">
29 
+		<div id="obscure_header_mobile" class="obscure" style="height: 960px;"></div>
30 
+	     <%= image_tag "photo_mission_control.jpg", id: 'photo_header_mobile', style: 'width: 100%;' %>
31 
+	     <div class="container" >
32 
+		  <div class="row">
33 
+			  <div class="span12" style="height: 20px; padding-left: 20px; padding-right: 20px;">
34 
+			       <div id="tagline_header_mobile" class="" style="background-color: transparent; position: relative; top: -700px;">
35 
+			         <h1 class="header mobile">Avalanche Network</h1>
36 
+			    	  </div>
37 
+		    	  </div>
38 
+	       </div>
39 
+          </div>
40 
+	  </div>
41 
+  </div>
42 
+</div><!-- /.carousel -->
43 
+
44 
+
45 
+
46 
+<div id="about" class="container" style="margin-top: 30px;">
47 
+	<div class="row">
48 
+
49 
+		<div class="span6">
50 
+			<h2 class="landing_page hidden-phone"><%= (t "landing_page.about_title").html_safe %></h2>
51 
+			<%= (t "landing_page.about_text").html_safe %>
52 
+
53 
+		</div>
54 
+		<div class="span6">
55 
+			<% if cookies[:avalanche_locale] ==  'en' %>
56 
+				<%= image_tag "fluxogram_avalanche@en.jpg", style: 'width: 100%;' %>
57 
+			<% else %>
58 
+				<%= image_tag "fluxogram_avalanche@pt-BR.jpg", style: 'width: 100%;' %>
59 
+			<% end %>
60 
+		</div>
61 
+
62 
+	</div>
63 
+</div>
64 
+
65 
+<!-- FEATURES -->
66 
+<div id="features" class="container hidden-phone">
67 
+	<div class="row">
68 
+
69 
+		<div class="span6">
70 
+			<h2 style="margin-bottom: 45px; margin-top: 35px;"><%= (t "landing_page.feature_headline_1").html_safe %></h2>
71 
+			<p class="lead"><%= (t "landing_page.feature_text_1").html_safe  %></p>
72 
+
73 
+		</div>
74 
+		<div class="span6">
75 
+			<h2 style="margin-bottom: 45px; margin-top: 35px;"><%= (t "landing_page.feature_headline_2").html_safe  %></h2>
76 
+			<p class="lead"><%= (t "landing_page.feature_text_2").html_safe  %></p>
77 
+		</div>
78 
+
79 
+	</div>
80 
+	<div class="row" style="margin-top: 25px;">
81 
+
82 
+		<div class="span6">
83 
+			<div class="media">
84 
+			  <span class="pull-left" href="#">
85 
+			    <%= image_tag "icons/icon_mission_64x64.png", style: 'width: 64px;' %>
86 
+			  </span>
87 
+			  <div class="media-body">
88 
+			    <p class="lead"><%= (t "landing_page.feature_1_item_1").html_safe  %></p>
89 
+			  </div>
90 
+			</div>
91 
+			<div class="media">
92 
+			  <span class="pull-left" href="#">
93 
+			    <%= image_tag "icons/icon_chat_64x64.png", style: 'width: 64px;' %>
94 
+			  </span>
95 
+			  <div class="media-body">
96 
+			    <p class="lead"><%= (t "landing_page.feature_1_item_2").html_safe %></p>
97 
+			  </div>
98 
+			</div>
99 
+			<div class="media">
100 
+			  <span class="pull-left" href="#">
101 
+			    <%= image_tag "icons/icon_task_64x64.png", style: 'width: 64px;' %>
102 
+			  </span>
103 
+			  <div class="media-body">
104 
+			    <p class="lead"><%= (t "landing_page.feature_1_item_3").html_safe %></p>
105 
+			  </div>
106 
+			</div>
107 
+			<div class="media">
108 
+			  <span class="pull-left" href="#">
109 
+			    <%= image_tag "icons/icon_diamond_64x64.png", style: 'width: 64px;' %>
110 
+			  </span>
111 
+			  <div class="media-body">
112 
+			    <p class="lead"><%= (t "landing_page.feature_1_item_4").html_safe %></p>
113 
+			  </div>
114 
+			</div>
115 
+		</div>
116 
+		<div class="span6">
117 
+			<div class="media">
118 
+			  <span class="pull-left" href="#">
119 
+			    <%= image_tag "icons/icon_mission_64x64.png", style: 'width: 64px;' %>
120 
+			  </span>
121 
+			  <div class="media-body">
122 
+			    <p class="lead"><%= (t "landing_page.feature_2_item_1").html_safe %></p>
123 
+			  </div>
124 
+			</div>
125 
+			<div class="media">
126 
+			  <span class="pull-left" href="#">
127 
+			    <%= image_tag "icons/icon_radar_64x64.png", style: 'width: 64px;' %>
128 
+			  </span>
129 
+			  <div class="media-body">
130 
+			    <p class="lead"><%= (t "landing_page.feature_2_item_2").html_safe %></p>
131 
+			  </div>
132 
+			</div>
133 
+			<div class="media">
134 
+			  <span class="pull-left" href="#">
135 
+			    <%= image_tag "icons/icon_gift_64x64.png", style: 'width: 64px;' %>
136 
+			  </span>
137 
+			  <div class="media-body">
138 
+			    <p class="lead"><%= (t "landing_page.feature_2_item_3").html_safe %></p>
139 
+			  </div>
140 
+			</div>
141 
+		</div>
142 
+	</div>
143 
+</div>
144 
+
145 
+<!-- FEATURES MOBILE -->
146 
+
147 
+<div id="features2" class="container visible-phone">
148 
+	<div class="row">
149 
+
150 
+		<div class="span6">
151 
+			<h2 ><%= (t "landing_page.feature_headline_1").html_safe %></h2>
152 
+			<p class="lead"><%= (t "landing_page.feature_text_1").html_safe  %></p>
153 
+
154 
+			<div class="media">
155 
+			  <span class="pull-left" href="#" style="">
156 
+			    <%= image_tag "icons/icon_mission_64x64.png", class: 'media-object', style: 'width: 64px;' %>
157 
+			  </span>
158 
+			  <div class="media-body">
159 
+			    <p class="lead"><%= (t "landing_page.feature_1_item_1").html_safe  %></p>
160 
+			  </div>
161 
+			</div>
162 
+			<div class="media">
163 
+			  <span class="pull-left" href="#">
164 
+			    <%= image_tag "icons/icon_chat_64x64.png", style: 'width: 64px;' %>
165 
+			  </span>
166 
+			  <div class="media-body">
167 
+			    <p class="lead"><%= (t "landing_page.feature_1_item_2").html_safe %></p>
168 
+			  </div>
169 
+			</div>
170 
+			<div class="media">
171 
+			  <span class="pull-left" href="#">
172 
+			    <%= image_tag "icons/icon_task_64x64.png", style: 'width: 64px;' %>
173 
+			  </span>
174 
+			  <div class="media-body">
175 
+			    <p class="lead"><%= (t "landing_page.feature_1_item_3").html_safe %></p>
176 
+			  </div>
177 
+			</div>
178 
+			<div class="media">
179 
+			  <span class="pull-left" href="#">
180 
+			    <%= image_tag "icons/icon_diamond_64x64.png", style: 'width: 64px;' %>
181 
+			  </span>
182 
+			  <div class="media-body">
183 
+			    <p class="lead"><%= (t "landing_page.feature_1_item_4").html_safe %></p>
184 
+			  </div>
185 
+			</div>
186 
+
187 
+		</div>
188 
+		<div class="span6">
189 
+			<h2><%= (t "landing_page.feature_headline_2").html_safe  %></h2>
190 
+			<p class="lead"><%= (t "landing_page.feature_text_2").html_safe  %></p>
191 
+
192 
+			<div class="media">
193 
+			  <span class="pull-left" href="#">
194 
+			    <%= image_tag "icons/icon_mission_64x64.png", style: 'width: 64px;' %>
195 
+			  </span>
196 
+			  <div class="media-body">
197 
+			    <p class="lead"><%= (t "landing_page.feature_2_item_1").html_safe %></p>
198 
+			  </div>
199 
+			</div>
200 
+			<div class="media">
201 
+			  <span class="pull-left" href="#">
202 
+			    <%= image_tag "icons/icon_radar_64x64.png", style: 'width: 64px;' %>
203 
+			  </span>
204 
+			  <div class="media-body">
205 
+			    <p class="lead"><%= (t "landing_page.feature_2_item_2").html_safe %></p>
206 
+			  </div>
207 
+			</div>
208 
+			<div class="media">
209 
+			  <span class="pull-left" href="#">
210 
+			    <%= image_tag "icons/icon_gift_64x64.png", style: 'width: 64px;' %>
211 
+			  </span>
212 
+			  <div class="media-body">
213 
+			    <p class="lead"><%= (t "landing_page.feature_2_item_3").html_safe %></p>
214 
+			  </div>
215 
+			</div>
216 
+		</div>
217 
+
218 
+	</div>
219 
+	<div class="row" style="margin-top: 25px;">
220 
+
221 
+		<div class="span6">
222 
+
223 
+		</div>
224 
+		<div class="span6">
225 
+
226 
+		</div>
227 
+	</div>
228 
+</div>
229 
+
230 
+<!-- SUBSCRIBE -->
231 
+
232 
+<div id="subscribe" class="hidden-phone carousel slide" data-ride="carousel" style=" margin-top: 60px;">
233 
+	 <div class="carousel-inner" role="listbox">
234 
+	   <div class="item active">
235 
+		<div class="obscure" id="obscure_subscribe" style="height: 970px;"></div>
236 
+	     <%= image_tag "photo_everest.jpg", id: 'photo_subscribe', style: 'width: 100%;' %>
237 
+	     <div class="container" >
238 
+		  <div class="row">
239 
+			  <div class="span12" style="height: 0px;">
240 
+			       <div id="tagline_subscribe" class="" style="background-color: transparent; position: relative; top: -700px;">
241 
+
242 
+			         <h1 class="header"><%= (t "landing_page.subscribe_title").html_safe %></h1>
243 
+			         <p class="lead header  ">
244 
+					    <%= (t "landing_page.subscribe_text").html_safe %>
245 
+				    </p>
246 
+				    <%= bootstrap_form_for(@subscription, remote: true) do |f| %>
247 
+				      <%= f.alert_message "Please fix the errors below."%>
248 
+				      <%= f.form_group :email, style: 'margin-top: -35px;' do %>
249 
+				        	<%= f.text_field :email, hide_label: true, placeholder: 'Email', class: 'span4 input-large', required: true, style: 'height: 30px; font-size: 24px; padding-top: 10px;' %>
250 
+				      <% end %>
251 
+				      <%= f.submit (t 'subscription.submit'), class: 'btn btn-large', id: 'submit_subscription' %>
252 
+				    <% end %>
253 
+			    </div>
254 
+		    </div>
255 
+	      </div>
256 
+          </div>
257 
+	  </div>
258 
+  </div>
259 
+</div>
260 
+
261 
+<!-- SUBSCRIBE MOBILE -->
262 
+
263 
+<div id="subscribe2" class="visible-phone carousel slide" data-ride="carousel" style="margin-top: 20px; margin-left: -20px; margin-right: -20px;">
264 
+	 <div class="carousel-inner" role="listbox">
265 
+	   <div class="item active">
266 
+		<div class="obscure" id="obscure_subscribe2" style="height: 970px;"></div>
267 
+	     <%= image_tag "photo_everest.jpg", id: 'photo_subscribe2', style: 'width: 100%;' %>
268 
+	     <div class="container" >
269 
+		  <div class="row">
270 
+			  <div class="span12" style="height: 0px;">
271 
+			       <div id="tagline_subscribe2" class="" style="background-color: transparent; position: relative; top: -700px;">
272 
+			  		<h1 class="header mobile"><%= (t "landing_page.subscribe_title").html_safe %></h1>
273 
+
274 
+			    </div>
275 
+		    </div>
276 
+	      </div>
277 
+          </div>
278 
+	  </div>
279 
+  </div>
280 
+</div>
281 
+
282 
+<div class="visible-phone" style="margin-bottom: 80px;">
283 
+    <p class="lead" >
284 
+	    <%= (t "landing_page.subscribe_text").html_safe %>
285 
+    </p>
286 
+    <%= bootstrap_form_for(@subscription, remote: true) do |f| %>
287 
+      <%= f.alert_message "Please fix the errors below."%>
288 
+      <%= f.form_group :email, style: 'margin-top: -35px;' do %>
289 
+        	<%= f.text_field :email, hide_label: true, placeholder: 'Email', class: 'span4', required: true, style: 'height: 50px; font-size: 24px; padding-top: 5px;' %>
290 
+      <% end %>
291 
+      <%= f.submit (t 'subscription.submit'), class: 'btn btn-large', id: 'submit_subscription' %>
292 
+    <% end %>
293 
+</div>
294 
+
295 
+<footer class="footer-white">
296 
+	<div class="container">
297 
+		<div class="row">
298 
+			<div class="column first">
299 
+				<div class="column-inner first centered">
300 
+			    	     <ul class="nav btn">
301 
+			    	          <li class="dropdown">
302 
+			    	            <a class="dropdown-toggle" data-toggle="dropdown" href="#">
303 
+			    	              <%= t('landing_page.lang') %>
304 
+			    	              <span class="caret"></span>
305 
+			    	            </a>
306 
+			    	            <ul class="dropdown-menu dropdown-menu-right" role="menu">
307 
+			    	              <li>
308 
+			    	                <%= link_to t('landing_page.en'), change_locale_path(:en) %>
309 
+			    	              </li>
310 
+			    	              <li>
311 
+			    	                <%= link_to t('landing_page.pt-BR'), change_locale_path(:"pt-BR") %>
312 
+			    	              </li>
313 
+			    	            </ul>
314 
+			    	          </li>
315 
+			    	      </ul>
316 
+				 </div>
317 
+			 </div>
318 
+			 <div class="column">
319 
+				 <div class="column-inner">
320 
+  		 		    <a class="btn-about" href="#about"><%= (t "landing_page.about").html_safe %></a><br>
321 
+  		 		    <a class="btn-features" href="#features"><%= (t "landing_page.features").html_safe %></a><br>
322 
+  		 		    <a class="btn-subscribe" href="#subscribe"><%= (t "landing_page.subscribe").html_safe %></a><br>
323 
+  		 		    <%= link_to (t "registration.sign_in"), new_user_session_path, class: "btn-login" %><br>
324 
+			    </div>
325 
+			 </div>
326 
+			 <div class="column">
327 
+				 <div class="column-inner">
328 
+				 	<p><%= t 'contact.contact'%><br><a href="mailto:<%= t 'contact.email_contact'%>@avalanche.network"><%= t 'contact.email_contact'%>@avalanche.network</a><br><%= t 'contact.current_location'%></p>
329 
+				 </div>
330 
+			 </div>
331 
+			 <div class="column">
332 
+				 <div class="column-inner centered">
333 
+					 <a href="https://www.facebook.com/pages/Avalanche-Network/932907863393529"><i class="fa fa-facebook-square fa-4x"></i></a>
334 
+				 	 <a href="https://twitter.com/avalanche_net"><i class="fa fa-twitter fa-4x"></i></a>
335 
+				</div>
336 
+			 </div>
337 
+			 <div class="column">
338 
+				 <div class="column-inner last centered">
339 
+				  	<a href="https://mixpanel.com/f/partner"><img src="//cdn.mxpnl.com/site_media/images/partner/badge_light.png" alt="Mobile Analytics" /></a>
340 
+				</div>
341 
+			 </div>
342 
+		</div>
343 
+		<div class="row">
344 
+			<hr style="margin-top: 20px; border-top: 1px solid #000000;">
345 
+			<p class="copyright" style="text-align: center;">&copy; Avalanche Network <%= Time.now.year %></p>
346 
+		</div>
347 
+	</div>
348 
+</footer>
349 
+

+ 13 - 5
app/views/uploads/edit.html.erb
Bestand weergeven 

@@ -1,6 +1,14 @@
1 
-<% title (t 'uploads.edit_file') + ' - ' + @config.website_name %>
2 
-<div class="page-header">
3 
-  <h1><%= t "uploads.edit_file" %></h1>
4 
-</div>
1 
+<%= content_tag(:div, class: 'container top-container') do %>
2 
+	<%= content_tag(:div, class: 'row') do %>
3 
+		<%= content_tag(:div, class: 'span12') do %>
4 
+
5 
+			<% title (t 'uploads.edit_file') + ' - ' + @config.website_name %>
6 
+			<div class="page-header">
7 
+			  <h1><%= t "uploads.edit_file" %></h1>
8 
+			</div>
5 9
6 
-<%= render 'form' %>
10 
+			<%= render 'form' %>
11 
+
12 
+		<% end %>
13 
+	<% end %>
14 
+<% end %>

+ 13 - 5
app/views/uploads/new.html.erb
Bestand weergeven 

@@ -1,5 +1,13 @@
1 
-<% title (t 'uploads.upload_file') + ' - ' + @config.website_name %>
2 
-<div class="page-header">
3 
-  <h1><%= t "uploads.upload_file" %></h1>
4 
-</div>
5 
-<%= render 'form' %>
1 
+<%= content_tag(:div, class: 'container container-tabs') do %>
2 
+	<%= content_tag(:div, class: 'row') do %>
3 
+		<%= content_tag(:div, class: 'span12') do %>
4 
+
5 
+			<% title (t 'uploads.upload_file') + ' - ' + @config.website_name %>
6 
+			<div class="page-header">
7 
+			  <h1><%= t "uploads.upload_file" %></h1>
8 
+			</div>
9 
+			<%= render 'form' %>
10 
+
11 
+		<% end %>
12 
+	<% end %>
13 
+<% end %>

+ 30 - 20
app/views/uploads/show.html.erb
Bestand weergeven 

@@ -1,23 +1,33 @@
1 
-<% title @upload.title + ' - ' + @config.website_name %>
2 
-<div class="page-header">
3 
-  <h1>
4 
-	<%= @upload.title %>
5 
-  	<%= link_to 'Edit', edit_upload_path(@upload), class: 'btn btn-mini pull-right', style: 'margin-top: 12px; margin-left: 6px;'%>
6 
-  	<%= link_to 'Delete', @upload, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger btn-mini pull-right', style: 'margin-top: 12px;' %>
7 
-  </h1>
8 
-</div>
1 
+<%= content_tag(:div, class: 'container top-container') do %>
2 
+	<%= content_tag(:div, class: 'row') do %>
3 
+		<%= content_tag(:div, class: 'span12') do %>
4 
+
5 
+			<%= bootstrap_flash %>
6 
+
7 
+			<% title @upload.title + ' - ' + @config.website_name %>
8 
+			<div class="page-header">
9 
+			  <h1>
10 
+				<%= @upload.title %>
11 
+			  	<%= link_to 'Edit', edit_upload_path(@upload), class: 'btn btn-mini pull-right', style: 'margin-top: 12px; margin-left: 6px;'%>
12 
+			  	<%= link_to 'Delete', @upload, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger btn-mini pull-right', style: 'margin-top: 12px;' %>
13 
+			  </h1>
14 
+			</div>
9 15
10 
-<div style="text-align:center">
11 
-	<% if @upload.get_extension == 'jpg' || @upload.get_extension == 'png' %>
12 
-	<%= image_tag @upload.file.to_s if @upload.file != nil %>
13 
-	<% else %>
14 
-	<%= link_to @upload.title, @upload.file.to_s %>
15 
-	<% end %>
16 
-</div>
16 
+			<div style="text-align:center">
17 
+				<% if @upload.get_extension == 'jpg' || @upload.get_extension == 'png' %>
18 
+				<%= image_tag @upload.file.to_s if @upload.file != nil %>
19 
+				<% else %>
20 
+				<%= link_to @upload.title, @upload.file.to_s %>
21 
+				<% end %>
22 
+			</div>
17 23
18 
- <%= @upload.description %>
24 
+			 <%= @upload.description %>
19 25
20 
-<br>
21 
-<div style="text-align:center">
22 
-	<%= link_to 'Back', admin_files_path, class: 'btn btn-link' %>
23 
-</div>
26 
+			<br>
27 
+			<div style="text-align:center">
28 
+				<%= link_to 'Back', admin_files_path, class: 'btn btn-link' %>
29 
+			</div>
30 
+
31 
+		<% end %>
32 
+	<% end %>
33 
+<% end %>

+ 1 - 0
config/routes.rb
Bestand weergeven 

@@ -2,6 +2,7 @@ Avalanche2::Application.routes.draw do
2 2
3 3 
   # Landing page
4 4 
   root 'start#index'
5 
+  get 'landing_page' => 'start#landing_page'
5 6
6 7 
   # Blog
7 8 
   get "blog" => "blog_posts#index", :as => :blog

+ 0 - 4
db/schema.rb
Bestand weergeven 

@@ -11,11 +11,7 @@
11 11 
 #
12 12 
 # It's strongly recommended that you check this file into your version control system.
13 13
14 
-<<<<<<< HEAD
15 14 
 ActiveRecord::Schema.define(version: 20150129033808) do
16 
-=======
17 
-ActiveRecord::Schema.define(version: 20150121040831) do
18 
->>>>>>> prototype
19 15
20 16 
   # These are extensions that must be enabled in order to support this database
21 17 
   enable_extension "plpgsql"

+ 1 - 11
features/admin_panel.feature
Bestand weergeven 

@@ -46,14 +46,4 @@ Feature: Admin Panel
46 46 
 		Given I am not logged in
47 47 
 		When I go to the configurations page
48 48 
 		Then I should see "You dont have permission to access that page!"
49 
-
50 
-	Scenario: Change the website name and Tagline
51 
-		Given I am logged in as admin
52 
-		And I should see "Rails Website Template"
53 
-		When I go to the configurations page
54 
-		Then I fill in "info_website_name" with "Testing Website Name"
55 
-		And I fill in "info_tagline" with "Just another cucumber test"
56 
-		And I click in the button "Update Config"
57 
-		Then I should see "Testing Website Name"
58 
-		And I should see in the field "info_website_name" the text "Testing Website Name"
59 
-		And I should see in the field "Tagline" the text "Just another cucumber test"
49 
+

+ 1 - 5
features/email_subscription.feature
Bestand weergeven 

@@ -15,9 +15,7 @@ Feature: Email Subscription
15 15 
 	Scenario: Newsletter subscription form
16 16 
 		Given I am not logged in
17 17 
 		And I visit the homepage
18 
-		And I should see "Subscribe to our newsletter"
19 
-		And I fill in "subscription_first_name" with "Monty"
20 
-		And I fill in "subscription_last_name" with "Cantsin"
18 
+		And I should see "Join the avalanche"
21 19 
 		And I fill in "subscription_email" with "monty_cantsin@canada.com"
22 20 
 		And I click in the button "submit_subscription"
23 21 
 		Then I should see "Thanks for subscribing to our newsletter"
 
@@ -34,8 +32,6 @@ Feature: Email Subscription
34 32
35 33 
 	Scenario: Somebody already registered tries to submit to newsletter subscription form
36 34 
 		Given I visit the homepage
37 
-		When I fill in "subscription_first_name" with "Jimy"
38 
-		And I fill in "subscription_last_name" with "San"
39 35 
 		And I fill in "subscription_email" with "jimysan@website.com"
40 36 
 		And I click in the button "submit_subscription"
41 37 
 		Then I should see "You have already registered to our newsletter"

+ 1 - 0
features/step_definitions/login_steps.rb
Bestand weergeven 

@@ -95,5 +95,6 @@ def admin_login
95 95 
   fill_in "Password", :with => '12345678'
96 96 
   click_button "Submit"
97 97 
   login_as user, scope: :user
98 
+  #page.driver.submit :post, user_session_path(:user => {email: "monty_cantsin@canada.com", password: "12345678"}), {}
98 99 
   visit root_path
99 100 
 end